From: Jonathan Lebon <jonathan@jlebon.com>
Date: Mon, 25 Jun 2018 14:08:21 +0000 (-0400)
Subject: tests/installed: Wait a bit more for http.server
X-Git-Tag: archive/raspbian/2022.1-3+rpi1~1^2~4^2~21^2~36
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=8dff04601b718869e67ac7f0ed8d535f89bedb58;p=ostree.git

tests/installed: Wait a bit more for http.server

And also print out the output if it still didn't start up in case there
are error messages hidden in there.

This should hopefully help with diagnosing the flakes we've been seeing
in starting it up.

Closes: #1652
Approved by: cgwalters
---

diff --git a/tests/installed/libinsttest.sh b/tests/installed/libinsttest.sh
index 1c192b8e..edf358f2 100644
--- a/tests/installed/libinsttest.sh
+++ b/tests/installed/libinsttest.sh
@@ -58,7 +58,8 @@ run_tmp_webserver() {
     cd -
     child_pid=$!
 
-    for x in $(seq 10); do
+    for x in $(seq 60); do
+        echo "Waiting for web server ($x/60)..." >&2
         # Snapshot the output
         cp ${test_tmpdir}/httpd-output{,.tmp}
         # If it's non-empty, see whether it matches our regexp
@@ -71,6 +72,12 @@ run_tmp_webserver() {
         fi
         sleep 1
     done
+
+    if [ ! -f ${test_tmpdir}/httpd-port ]; then
+      cat ${test_tmpdir}/httpd-output
+      fatal "can't start up httpd"
+    fi
+
     port=$(cat ${test_tmpdir}/httpd-port)
     echo "http://127.0.0.1:${port}" > ${test_tmpdir}/httpd-address
     echo "$child_pid" > ${test_tmpdir}/httpd-pid